From ff3a405c4dbf73525e2a65ca60276f5d4ed6a8ae Mon Sep 17 00:00:00 2001 From: "chris@kneesaa.uk.xensource.com" Date: Tue, 8 Aug 2006 11:28:35 +0100 Subject: [PATCH] [qemu patches] Refresh patches. Signed-off-by: Christian Limpach --- tools/ioemu/patches/domain-destroy | 16 ++++++++-------- tools/ioemu/patches/domain-reset | 16 ++++++++-------- tools/ioemu/patches/domain-timeoffset | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/ioemu/patches/domain-destroy b/tools/ioemu/patches/domain-destroy index a1ccde7c1b..a4c5fbc834 100644 --- a/tools/ioemu/patches/domain-destroy +++ b/tools/ioemu/patches/domain-destroy @@ -1,7 +1,7 @@ Index: ioemu/monitor.c =================================================================== ---- ioemu.orig/monitor.c 2006-08-06 02:22:01.487319736 +0100 -+++ ioemu/monitor.c 2006-08-06 02:23:02.269544103 +0100 +--- ioemu.orig/monitor.c 2006-08-08 11:27:48.555190337 +0100 ++++ ioemu/monitor.c 2006-08-08 11:27:53.984584612 +0100 @@ -308,6 +308,7 @@ static void do_quit(void) @@ -12,10 +12,10 @@ Index: ioemu/monitor.c Index: ioemu/target-i386-dm/helper2.c =================================================================== ---- ioemu.orig/target-i386-dm/helper2.c 2006-08-06 02:22:59.251880493 +0100 -+++ ioemu/target-i386-dm/helper2.c 2006-08-06 02:23:02.270543991 +0100 -@@ -483,5 +483,25 @@ - shared_page->vcpu_iodata[send_vcpu].dm_eport); +--- ioemu.orig/target-i386-dm/helper2.c 2006-08-08 11:27:53.063687351 +0100 ++++ ioemu/target-i386-dm/helper2.c 2006-08-08 11:27:54.011581601 +0100 +@@ -488,5 +488,25 @@ + xc_evtchn_notify(xce_handle, ioreq_local_port[send_vcpu]); } } + destroy_hvm_domain(); @@ -42,8 +42,8 @@ Index: ioemu/target-i386-dm/helper2.c +} Index: ioemu/vl.h =================================================================== ---- ioemu.orig/vl.h 2006-08-06 02:22:59.255880047 +0100 -+++ ioemu/vl.h 2006-08-06 02:23:02.271543880 +0100 +--- ioemu.orig/vl.h 2006-08-08 11:27:53.067686905 +0100 ++++ ioemu/vl.h 2006-08-08 11:27:54.061576023 +0100 @@ -1189,4 +1189,7 @@ void kqemu_record_dump(void); diff --git a/tools/ioemu/patches/domain-reset b/tools/ioemu/patches/domain-reset index 4ff8d90281..f5613e3e5e 100644 --- a/tools/ioemu/patches/domain-reset +++ b/tools/ioemu/patches/domain-reset @@ -1,8 +1,8 @@ Index: ioemu/target-i386-dm/helper2.c =================================================================== ---- ioemu.orig/target-i386-dm/helper2.c 2006-08-06 02:21:15.779415007 +0100 -+++ ioemu/target-i386-dm/helper2.c 2006-08-06 02:22:59.251880493 +0100 -@@ -123,6 +123,25 @@ +--- ioemu.orig/target-i386-dm/helper2.c 2006-08-08 11:27:45.566523765 +0100 ++++ ioemu/target-i386-dm/helper2.c 2006-08-08 11:27:53.063687351 +0100 +@@ -127,6 +127,25 @@ /* called from main_cpu_reset */ void cpu_reset(CPUX86State *env) { @@ -28,7 +28,7 @@ Index: ioemu/target-i386-dm/helper2.c } void cpu_x86_close(CPUX86State *env) -@@ -449,6 +468,10 @@ +@@ -455,6 +474,10 @@ if (vm_running) { if (shutdown_requested) break; @@ -41,8 +41,8 @@ Index: ioemu/target-i386-dm/helper2.c /* Wait up to 10 msec. */ Index: ioemu/vl.c =================================================================== ---- ioemu.orig/vl.c 2006-08-06 02:22:56.618174081 +0100 -+++ ioemu/vl.c 2006-08-06 02:22:59.254880158 +0100 +--- ioemu.orig/vl.c 2006-08-08 11:27:52.994695048 +0100 ++++ ioemu/vl.c 2006-08-08 11:27:53.066687017 +0100 @@ -4948,7 +4948,7 @@ } QEMUResetEntry; @@ -54,8 +54,8 @@ Index: ioemu/vl.c Index: ioemu/vl.h =================================================================== ---- ioemu.orig/vl.h 2006-08-06 02:22:01.501318175 +0100 -+++ ioemu/vl.h 2006-08-06 02:22:59.255880047 +0100 +--- ioemu.orig/vl.h 2006-08-08 11:27:48.757167803 +0100 ++++ ioemu/vl.h 2006-08-08 11:27:53.067686905 +0100 @@ -130,6 +130,7 @@ void qemu_register_reset(QEMUResetHandler *func, void *opaque); diff --git a/tools/ioemu/patches/domain-timeoffset b/tools/ioemu/patches/domain-timeoffset index 0ae6d3c789..309f47700d 100644 --- a/tools/ioemu/patches/domain-timeoffset +++ b/tools/ioemu/patches/domain-timeoffset @@ -1,7 +1,7 @@ Index: ioemu/hw/mc146818rtc.c =================================================================== ---- ioemu.orig/hw/mc146818rtc.c 2006-08-07 17:44:43.593604340 +0100 -+++ ioemu/hw/mc146818rtc.c 2006-08-07 17:44:47.594168708 +0100 +--- ioemu.orig/hw/mc146818rtc.c 2006-08-08 11:27:33.924822567 +0100 ++++ ioemu/hw/mc146818rtc.c 2006-08-08 11:28:01.929698228 +0100 @@ -178,10 +178,27 @@ } } @@ -46,8 +46,8 @@ Index: ioemu/hw/mc146818rtc.c static void rtc_copy_date(RTCState *s) Index: ioemu/hw/pc.c =================================================================== ---- ioemu.orig/hw/pc.c 2006-08-07 17:44:47.324198106 +0100 -+++ ioemu/hw/pc.c 2006-08-07 17:44:54.830380715 +0100 +--- ioemu.orig/hw/pc.c 2006-08-08 11:27:58.117123572 +0100 ++++ ioemu/hw/pc.c 2006-08-08 11:28:01.930698117 +0100 @@ -159,7 +159,7 @@ } @@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c QEMUMachine pc_machine = { Index: ioemu/vl.c =================================================================== ---- ioemu.orig/vl.c 2006-08-07 17:44:47.464182863 +0100 -+++ ioemu/vl.c 2006-08-07 17:44:54.830380715 +0100 +--- ioemu.orig/vl.c 2006-08-08 11:28:01.787714069 +0100 ++++ ioemu/vl.c 2006-08-08 11:28:01.933697782 +0100 @@ -163,6 +163,8 @@ int xc_handle; @@ -174,8 +174,8 @@ Index: ioemu/vl.c if (usb_enabled) { Index: ioemu/vl.h =================================================================== ---- ioemu.orig/vl.h 2006-08-07 17:44:47.329197562 +0100 -+++ ioemu/vl.h 2006-08-07 17:44:54.830380715 +0100 +--- ioemu.orig/vl.h 2006-08-08 11:28:01.517744187 +0100 ++++ ioemu/vl.h 2006-08-08 11:28:01.934697671 +0100 @@ -575,7 +575,7 @@ int boot_device, DisplayState *ds, const char **fd_filename, int snapshot, -- 2.30.2